From: Ray Strode <rstrode@redhat.com>
Date: Thu, 25 Jun 2015 19:39:58 +0000 (-0400)
Subject: gdm: fix banner allocation computation
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~1322
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=0003760fd943082861993c002da1080b958a1584;p=gnome-shell.git

gdm: fix banner allocation computation

The code to figure how how much room that banner had was wrong.
This commit fixes it.

https://bugzilla.gnome.org/show_bug.cgi?id=751517
---

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 38f53d476..0dabacdc2 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -584,7 +584,14 @@ const LoginDialog = new Lang.Class({
         // try a different layout, or if we have what extra space we
         // can hand out
         if (bannerAllocation) {
-            let leftOverYSpace = dialogHeight - bannerHeight - authPromptHeight - logoHeight;
+            let bannerSpace;
+
+            if (authPromptAllocation)
+                bannerSpace = authPromptAllocation.y1 - bannerAllocation.y1;
+            else
+                bannerSpace = 0;
+
+            let leftOverYSpace = bannerSpace - bannerHeight;
 
             if (leftOverYSpace > 0) {
                  // First figure out how much left over space is up top